Make sure we check for a NULL model first.

2004-07-02  Anders Carlsson  <andersca@gnome.org>

	* gtk/gtktreeview.c (gtk_tree_view_set_model):
	Make sure we check for a NULL model first.

diff --git a/ChangeLog b/ChangeLog
index ee292c93f0f11e8029e904994f34a3326de20fcb..200ba33c68f1e0076aa84aef1cfdc7588ad469d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-02  Anders Carlsson  <andersca@gnome.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): 
+       Make sure we check for a NULL model first.
+
 2004-07-01  J. Ali Harlow  <ali@juiblex.co.uk>
 
        * gdk/win32/gdkinput-win32.c (_gdk_input_ungrab_pointer): Fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ee292c93f0f11e8029e904994f34a3326de20fcb..200ba33c68f1e0076aa84aef1cfdc7588ad469d9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-07-02  Anders Carlsson  <andersca@gnome.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): 
+       Make sure we check for a NULL model first.
+
 2004-07-01  J. Ali Harlow  <ali@juiblex.co.uk>
 
        * gdk/win32/gdkinput-win32.c (_gdk_input_ungrab_pointer): Fix

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ee292c93f0f11e8029e904994f34a3326de20fcb..200ba33c68f1e0076aa84aef1cfdc7588ad469d9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-07-02  Anders Carlsson  <andersca@gnome.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): 
+       Make sure we check for a NULL model first.
+
 2004-07-01  J. Ali Harlow  <ali@juiblex.co.uk>
 
        * gdk/win32/gdkinput-win32.c (_gdk_input_ungrab_pointer): Fix

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ee292c93f0f11e8029e904994f34a3326de20fcb..200ba33c68f1e0076aa84aef1cfdc7588ad469d9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-07-02  Anders Carlsson  <andersca@gnome.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): 
+       Make sure we check for a NULL model first.
+
 2004-07-01  J. Ali Harlow  <ali@juiblex.co.uk>
 
        * gdk/win32/gdkinput-win32.c (_gdk_input_ungrab_pointer): Fix

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index f1f567df7fb8535364e24e6538fd85f188a13bc8..977ca2b32bac51345272da8d16bc49108a92728e 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -8747,7 +8747,9 @@ gtk_tree_view_set_model (GtkTreeView  *tree_view,
                         GtkTreeModel *model)
 {
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
-  g_return_if_fail (GTK_IS_TREE_MODEL (model));
+
+  if (model != NULL)
+    g_return_if_fail (GTK_IS_TREE_MODEL (model));
 
   if (model == tree_view->priv->model)
     return;